Initial tidy up of old code
Bump for 1.0.1
Merge branch 'release/1.0.1'