Revert "Merge pull request #71 from oluckyman/master"

This reverts commit 2ebaf5e4e5fe979d001b628aa95add07735a7f0e.