12.11
2014.12.12
Merge pull request #4 from shenchenyu/master

12.12 res