Updated the build
Merge pull request #9 from msipe/master

Updated the build