update readme, adapt unittests for english version
Merge origin/master