Build fixes and cleanup
Build fixes and cleanup
Merge pull request #2 from MikeChristensen/master

Build fixes and cleanup