Merge branch 'master' into kyle
Fixed default not being active at install & removed debug.
Merge branch 'kyle'