Merge pull request #9 from Cook1fan/master

Merge pull request #9 from 394802198/master
2014-09-19
Merge pull request #10 from 394802198/master

2014-09-19