Converted sm-1_0 to branch and sm-1_1 to trunk