Syncing repo with minor changes
Merge branch 'master' of ssh://github.com/jccaicedo/localization-agent