fix problems from errors from the future
Merge pull request #20 from grosser/master

fix problems from errors from the future