Merge pull request #2 from mkey0bc/dev

Dev