more functions
Merge pull request #1 from umtrey/master

more functions