Added shahid as initial author