Implementing bunch of methods and adding tests and making them pass
Merge remote-tracking branch 'origin/master'