Revert "Pull request #16"

This reverts commit 6730530030b855cbd2964418b343ee2bc7b2ee26.