Code: Minor improvement.
Merge pull request #328 from am11/master

Code: Minor improvement