Merge pull request #140 from Cook1fan/master

Merge pull request #142 from 394802198/master
2014-06-24
Merge pull request #143 from 394802198/master

Steven