Merge pull request #9 from Jeaye/master

Language changes with extern modules