Fixed some inconsistencies + bump version number