Merge pull request #2 from yupe/dev

Dev