Merge pull request #3 from yupe/dev

Dev