caseyyoungflesh Merge pull request #47 from caseyyoungflesh/dev