formatting + @Override annotations
Merge branch 'master' into beta