Name correction
Merge branch 'master' of https://github.com/elliottm/Fri_test