Merge pull request #118 from hazendaz/master

Tweaking Build