Because my demand included a bug, I was simply modifications.

refs #47
Merge pull request #48 from guehara/lang_support

Because my demand included a bug, I was simply modifications.