Merge pull request #61 from Cook1fan/master

Steven
2014-04-09
re