Includes the Comments from the upstream
Merge pull request #5 from terwey/patch-2

Includes the Comments from the upstream