Pull of latest changes
Merge pull request #70 from kaustabh/master

Pull of latest changes for generating the list of conflicting bugs