Merge pull request #177 from Cook1fan/master

Merge pull request #181 from 394802198/master
2014-07-31
Merge pull request #182 from 394802198/master

Steven