Fixes for #1 #2 #3.
bump version.
Merge pull request #5 from dstegelman/feature/upgrades

Upgrades