Merge branch 'Peter'
Adding one of my functions
Merge branch 'master' into Peter