Added more stuff.
Merge pull request #1 from jcornelius/master

Added more stuff.