added new function..
Changes 5
Merge