Merge pull request #35 from TBaudon/dev

Dev
Merge branch 'dev'