Merge pull request #18 from pmbober/master

fixed build issues