#39 - fixed.
#36 - added more functions
Merge pull request #41 from ahebert/master

#36 - added more functions