Quelques fixes
Merge pull request #46 from Jyru-Ken/master

A few fixes