Reverted constructor
Undo most changes as they are not needed. Actually works now.
Merge pull request #2 from khornberg/master

Wholly untested update courtesy of @khornberg, use at your own risk as I don't have time to maintain this library any more..