Merge pull request #151 from Cook1fan/master

Merge pull request #156 from 394802198/master
2014-07-08
Merge pull request #157 from 394802198/master

Steven