fix regex to accept "、" character
thoughts on restructuring
merge