Made variables final where necessary
Merge remote-tracking branch 'yourclub/master'