Implementation of some methods
Merge origin/master