Fixed build errors and made the sample generation cleaner
Merge branch 'master' of github.com:benjojo/HoldThis