Preparations and bugfixes for Release 1.0.0