Merge pull request #6 from sim0nx/master

fix build issues