renamed methods to follow protocol
Merge origin/master