mostly testing; slight changes in wording
Merge pull request #2 from nich0s/functionrefactor

mostly testing; slight changes in wording