trevorpogue Merge pull request #1 from trevorpogue/dev