This new version contains some general fixes and improvements