added function
small bug fixed..
Merge remote-tracking branch 'origin/master'