Merge pull request #112 from Cook1fan/master

Steven