Merge pull request #1 from weaties/dev

Dev