roll back to 2014/03/14
Merge branch 'master' of https://github.com/hyh122/test2