Hotfix/2.0.2 locale change

* Hotfix release meant to solve the severe bug described in #151
* #150 has been included too
* `develop` is not been used as it includes further features development (IAM integration)