Merge pull request #22 from psychic-archer/develop

v 0.5
Correction erreur id
Finish Hotfix-1