I improved the tokenizing method.
Issue #12