Merge pull request #112 from Cook1fan/master

Steven
steven
2014-05-21
Merge pull request #117 from 394802198/master

Steven