added numbers support and " suffix