Revert "Merge pull request #6 from kiorky/master"

This reverts commit b2f12731783a77f026833abaf293f1a7057d9259, reversing
changes made to 634e71486fdd660d20d336a823abc4007fd2755c.