Changes in support of the build
Merge pull request #172 from alxdarksage/develop

Changes in support of the build