add methods
Merge origin/master