Revert "Merge pull request #44 from noxiouz/feature"

This reverts commit e30dc77f248c7b61de55c9bf79635026a9fa3605, reversing
changes made to 38d2ca840ff56abe15bb3be3a11a34b2433f447d.