Merge pull request #1 from TomT5454/master

test
joel final edit for this iteration - somebody else poke it.
Merge pull request #2 from joelja/master

should be my last edit for a while