Added name to method where required
Merge origin/master