final changes for version 1.0 prepared