0.2.6
Merge branch '0.2.6'