Merge pull request #8 from ncanceill/dev

Going multi-language