added a bunch
Merge pull request #16 from rswhiting/master

added a bunch