Merge pull request #14 from bjoern-esser/master

fix build
fix build issues