Tons more features
Merge pull request #4 from SpencerAlanWatson/master

Tons more features