first commit
Merge https://github.com/bsjohnson/wombat