Merge pull request #9 from 394802198/master

2014-09-15
Merge pull request #9 from Cook1fan/master

Merge pull request #9 from 394802198/master