Merge pull request #381 from Zackriya-Solutions/devtest