2014-1-28 haiyun605 final
Merge branch 'master' of https://github.com/atrmat/Caquaricorn