#33 fixed, also updated version and formatting