added new function
fixed bug
Merge branch 'topic'