improve support for more complex languages
release 1.0.1