Choosing labels.
Refactoring
Mainly adding internationalization support.
Merge branch 'balhar' into master-github