Merge pull request #218 from Cook1fan/master

Merge pull request #227 from 394802198/master
2014-10-21
Merge pull request #228 from 394802198/master

2014-10-21