Merge pull request #30 from pflannery/dev

Fixes build issues