renamed "functions" to "features" bc it makes sense
Merge 'master' - rename "functions" to "features"