Merging in version bump NO BUG