Merge pull request #173 from Cook1fan/master

Merge pull request #177 from 394802198/master
2014-07-27
Merge pull request #178 from 394802198/master

Steven