Merge pull request #7 from Cook1fan/master

Steven
2014-03-05
pass