Merge pull request #147 from Zackriya-Solutions/devtest