Merge "Added @Override method"