Merge origin/Gael into Gael
Merge pull request #11 from garzgul/Gael

Merge origin/Gael into Gael