Merge pull request #6 from gatespace/_s_commit_220d682

Merge: _s commit [220d682] and language files.