coryleach Merge pull request #6 from coryleach/dev