Revert "Merge pull request #21 from umby24/master" per AndrewPH's request

This reverts commit cd35f7aa8ad5cb3f12ef0055371463afa7e615da, reversing
changes made to 0d388a99188b8f5ea22cdadea2e5b402e94b4fdd.