Merge pull request #17 from Zackriya-Solutions/devtest