changes
added functions
Merge pull request #6 from johnchase/master

changes