Addresses #10 and #2
Merge pull request #11 from wblankenship/upgrade

Addresses #10 and #2