Merge pull request #6 from 394802198/master

2014-09-10
Merge pull request #5 from Cook1fan/master

Merge pull request #6 from 394802198/master