renamed function
added in katie's function
Merge pull request #16 from dcaff/master

Merging
Merge pull request #11 from JackStat/master

merge