Fix typo
Merge branch '0.2'