Merge pull request #17 from poupotte/master

Code cleaning