kurtis-s Merge pull request #23 from kurtis-s/dev