fixes for previous commit
Merge pull request #4 from Jgke/master

fixed build failures after #3