Don't use underscores in partial names
Merge branch 'v0.1'