Bump version number to 1.0.1
Merge branch 'trunk'