Grafx2
Merge pull request #54 from hsarret/master

Grafx2