Merge pull request #13 from Armaklan/master

Gloups
Merge pull request #58 from gailin24px/master

Merge pull request #13 from Armaklan/master