Merge pull request #1 from christheswiss/master

warm up additions
Merge pull request #2 from christheswiss/master

a few additions. times not added