Finished
Merge pull request #104 from tsutro/master

Finished, or as close as I could get.