Merge pull request #170 from Cook1fan/master

Merge pull request #174 from 394802198/master
2014-07-26
Merge pull request #175 from 394802198/master

Steven