Merge pull request #19 from grosser/master

remove hacks
v1.0.3
fix problems from errors from the future