CSH-1207 : Changed the author as the module is completely re-written