Closes #30 - Merge branch 'language'