Merge pull request #153 from Cook1fan/master

Merge pull request #158 from 394802198/master
2014-07-08
Merge pull request #159 from 394802198/master

Steven