Prepared version 1.0 branch