Merging in changes from @cgzones
Merge pull request #55 from jrossi/cgzones-make-clean-binaries

Merging in changes from @cgzones