Fixed some more bugs
Version bumped up to v1.2.0