function vs. functionality
Merge pull request #1 from scrogson/master

function vs. functionality