0.3
Merge branch '0.3'