Merge pull request #105 from Cook1fan/master

Steven
2014-05-16
re