#39 - fixed.
#36 - added more functions