Merge pull request #19 from dbeck/master

fixing all build issues on linux by pulling downstream changes