Merge pull request #14 from dcs24/master

Bug fixes
Merge pull request #15 from dcs24/master

One more change
localization for questions
bug fixes for localization