Merge pull request #5 from Armaklan/master

modifs arma
Revision mantis #33
Revision mantis #37
Merge pull request #46 from gailin24px/master

revision mantis #33 et #37