Issue #9
Feature upgrade