Code: Minor improvements.
Merge pull request #690 from am11/master

Code: Minor improvements