Fixup build
Merge pull request #60 from johngatti/Dev

Fixup build