Minor fixes
Bump to 0.2.1