From GTM to Supertag
Merge pull request #176 from NicolasSzewe/master

From GTM to Supertag