Merge pull request #176 from Cook1fan/master

Merge pull request #180 from 394802198/master
2014-07-30
Merge pull request #181 from 394802198/master

Steven