Merge branch 'master' into 0.3
0.3.1
0.3.1
Merge branch '0.3'