Fixes on translation merging
Merge pull request #19 from astagi/master

Fixes on translation merging