Merge pull request #15 from mkey0bc/dev

Dev