version bump
pull in changes from develop branch