Fix failing test
Merge branch '0.2'