remove hacks
Merge pull request #19 from grosser/master

remove hacks