Merge pull request #10 from ChildrenOfUr/dev

Dev