Fix typo
Merge branch '0.1'