v0.3.1 #2, #3, #4,
Merge branch 'v0.3'