Merge pull request #9 from foens/dev

Dev