Updated with new functions
Merge pull request #131 from RobertKajnak/master

Updated with new functions