Merge pull request #21 from nitay/master

Fix Build