Merge pull request #3 from mkey0bc/dev

Dev