Merge pull request #62 from Cook1fan/master

Steven
2014-04-10
re