Merge pull request #10 from mkey0bc/dev

Dev