Field based Translation + Small Fixes
Merge pull request #581 from nownikhil/master

Field based Translation + Small Fixes