Merge pull request #15 from Zackriya-Solutions/devtest