0.2.7
Merge branch '0.3-dev'