Merge pull request #142 from Cook1fan/master

Steven
2014-06-26
re