Merge pull request #416 from am11/master

Code: Minor improvements