Making enhancement
Merge branch 'master' into r2
Merged from master and added more functions