added function
Merge origin/master
edited function