Merge pull request #372 from Zackriya-Solutions/devtest