Renaming functions
Merge branch 'master' of github.com:bjk17/Vefforritun