Merge pull request #1 from mkey0bc/dev

Dev