Clean up the build
Merge pull request #34 from OlegIlyenko/master

Clean up the build