Merge pull request #5 from mkey0bc/dev

Dev