Fixed bad merge.
Merge branch 'release/0.2.1'