Merge pull request #1 from orvice/dev

Dev