Pull request from riaz to master