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

This reverts commit a92fb560498254bf6380c920d8b69bc41c217352, reversing
changes made to 9ad4b14abbbcbd326abc0208174cb43b71fe46e3.
Revert "Revert "Merge pull request #1 from iBaa/master""

This reverts commit d6b7e320a0e74b51d88bd0a43c0884b8ac58b293.