Various fixes and upgrades
Merge pull request #2 from mbeall/master

Various fixes and upgrades