Fixed typo in changelog
Merge branch '0.2'