Updated Build scripts
Merge pull request #1 from ciandt-dev/master

Updated Build scripts