ready for voyager alpha
version bump
merge resolution