improve error messages; add normalization examples
remove tabs
Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
merge fix
0.9.6