Merge tag '0.3.6' into develop

Released-0.3.6 0.3.6
improved handling with localized models
bumped version
Merge branch 'release/0.3.7'