Merge pull request #11 from Zackriya-Solutions/optimize/main