v0.3.1
Merge branch 'v0.3'