Merge pull request #14 from pmorie/dev/upgrade_analysis

Dev/upgrade analysis
Upgrade API enhancement
Fixes