Now handles more messages
Version bumped up to v1.0.2