Merge pull request #1076 from am11/master

Code: Minor changes