Merge pull request #174 from Cook1fan/master

Merge pull request #178 from 394802198/master
2014-07-28
Merge pull request #179 from 394802198/master

Steven