Merge pull request #2 from tquante/dev

Dev