Update boilerplate code
Fix up issues left over from boilerplate update
Merge branch 'release/v0.1.2'