Remove delimeter and fix parser. This final commit should close #6 enchantment! Yay!