Fixes
Merge pull request #15 from pmorie/dev/upgrade_analysis

Dev/upgrade analysis