Issue #27 fixed, correct way to split tokens.