update 18.09.2013

Some changes regarding language detection and implementation.