Merge pull request #49 from isdixit/master

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