Revert "Pull request #1"
Merge pull request #18 from Minecrell/revert-17-patch-1

Revert "Pull request #1"