updated methods
Merge origin/master
updated methods
Merge origin/master