Revert "Merge pull request #16 from msieben/master"

This reverts commit d70da002523f329ecbcdaff3097981f4a182635e, reversing
changes made to 22137bd6d0b02b3750a46e036b960fe2afacc29a.