added more conditionals, version bump
