Merge pull request #153 from dcleao/CLEANUP

[CLEANUP] - Review build scripts
[CLEANUP] - Review build scripts
* Fix the fix.