Merge pull request #2 from blazeqwest/dev

Dev