Merge pull request #32 from devoncarew/devoncarew_upgrade

Devoncarew upgrade