Merge pull request #141 from adrian17/master

Changed function name to be consistent with header