cook 2014-03-17
merge
Merge pull request #27 from Cook1fan/master

Steven