Version bump and bugfix