cook 2014-03-18
merge
re
Merge pull request #28 from Cook1fan/master

Steven