Rc 1.0.0 bugfix to master