code quality and bumps version:
merge