Proposed code changes round #1
Merge pull request #1 from clohr/master

Proposed code changes round #1