LRA-192 removing hardcoded language
Merge pull request #10 from jkamcc/master

LRA-192 partial fixes