Revert "version 1.1 2014/6/18"

This reverts commit 1e534c45f31910779fcd780f5c3a1134505aacdc.
Revert "Revert "version 1.1 2014/6/18""

This reverts commit ca19f290af19a9740aa9fdeb45db93d69b0ad5ca.
version1.0 2014/6/18

完成代码的修改