Pushed to master. Thank you all for the review! :-)