Minor fixes
Update version to 0.2