Version 0.4 - better language detection