Rm'd an 'f' from the template
Merge branch 'fix/59-f'