Removing numbers on fn names, branch f
Merge branch 'f'
This closes issue #6.