Merge pull request #12 from pmorie/dev/upgrade_analysis

Dev/upgrade analysis
Upgrade fixes
Fixes