Merge pull request #15 from cobalt74/master

Yeay !! Merfi boucoup !