Merge pull request #16 from Conceptual-Design/master

Resolve merge issues and build configuration issues