Nick007J Merge pull request #930 from Nick007J/master