Version 0.2.1

A few bugs fixed