A bunch of additions.
Merge pull request #11 from ctbeiser/patch-2

A bunch of additions.