Changes incorporated and defects removed
Merge pull request #41 from arkhitech/Defects-564-564-translation-checkout

Changes incorporated and defects removed