Fixed bad merge
Release 0.2.1