initial commit
Merge pull request #1 from bdunnette/master

catch-up