Fix part2
Merge pull request #68 from Cocotus/master

LongLanguage Fix Part2