more functions
Merge pull request #5 from baz44/master

more functions