[CLEANUP] Fixes to the build scripts.
Merge pull request #91 from dcleao/master

[CLEANUP] Fixes to the build scripts.