Merge pull request #11 from CNRobinKill/Robin

20130423_17:49
Merge pull request #12 from CNRobinKill/Robin

20130424_0:16
20130424ByFinkle09:30
Merge pull request #14 from Ni9e/master

20130424_09:33