Make some stuff static or final
Merge remote-tracking branch 'origin/master'