Minfixes and code cleaning
Release 1.0