Revert "Merge pull request #38 from 52North/master"

This reverts commit 9631133fa5d394ebf38ddb3e42b52eb5f880bc91, reversing
changes made to e895f83a7f93462d050eb86ff43d2ada64ce6e83.