A bit of wrapping
Merge branch 'release/v0.0.1-1b'