fixed version number for next release
fixed issue that cmake complained about
merged latest changes in master