Adding stubs for the methods to implement
Merge remote-tracking branch 'origin/master'