Merge pull request #481 from serapath-contribution/master
RE-ADD previously reverted build process improvements & refactoringspull/1/head
commit
2498f6ff51
RE-ADD previously reverted build process improvements & refactoringspull/1/head