Removed duplicatas, fixed #164