huge refactoring with localization re-design and test coverage 08012013
huge refactoring with localization re-design and test coverage 10012013