closes #2 and #5 build process now complete
Merge remote-tracking branch 'origin/master'