Version 0.2.1
Merge branch '0.2'
Fix conflicts