Inital commit of Sofa Issue 2012 03 01