Now proper character handling

Closes #171