Merge pull request #21 from mkey0bc/dev

Dev