Version bump and code style fixes