fixed #19, cleanup and minor build refactoring
cleanup script
Merge pull request #20 from zelgerj/master

fixed #19, cleanup and minor build refactoring