Revert "Merge pull request #1 from amazingant/master"

This reverts commit d199875eef12dc77fa075e3ffaa7fd5834f646a7, reversing
changes made to b4f3fcb498b6f9df420c6b785a3aba4b7f77985d.
Revert "Revert "Revert "Revert "Merge pull request #1 from amazingant/master""""

This reverts commit 4ee4c1c75bbf62f499ab157e7ed782431732fda1.