Eliminated code duplicates.
Version number is bumped up.