Merge pull request #50 from isdixit/roller-6.0.x

Added '@Override' should be used on overriding and implementing methods. (ROL-2159)