Revert "Merge pull request #5 from flipside/develop"

This reverts commit 1ef4f2930c6204e7dbc944f1f56c4952298574d8.