Merge pull request #1 from rudzick/master

comment added
Merge pull request #1 from momolinus/master

re-master