Whitespace
Fail early, explain where and why
Merge pull request #76 from richo/features/tweaks

Build instrumentation