Pull request to master

Done. Thanks.