Revert "Merge pull request #14 from florianeckerstorfer/master"

This reverts commit 737b73fe7fb3bb8eb9bb971e5c40a7a51bb4b3ec, reversing
changes made to efa4298e2cbee021b9313f9ecc9675f4fbe97da2.
Merge pull request #18 from bamarni/master

Reverted previous merge as it introduces regressions