Merge pull request #131 from lpshanley/master

Merge Functions File