Fix stupide bug
Merge pull request #38 from oroulet/master

Fix stupide bug and cleanup. please merge