Implementing solution for language links discussed in Issue #1.
Fixing merge issues.