Added secondary language support

Changes requested on #4