Merge pull request #84 from r000n/staging

Staging - small fixes and initial translation