Merge tag '0.3.5' into develop

Released-0.3.5 0.3.5
fix for localized entries
bumped version
Merge branch 'release/0.3.6'