added dash/hyphen support