Merge pull request #43 from Cook1fan/master

Steven
2014-03-28
'merge'