Pull request to master

Done. Thanks for the tip.