allow for data to be returned by a function
Merge branch 'master' into mp
formatting