#36 - added more functions

#36 - added more functions