Fixed bugs and bumped version to 0.2