Fixed bugs
Version bumped up to v1.0.2