Added the ability to remove/override extensions
Merge branch 'develop'