kendricktan Merge pull request #12 from kendricktan/dev