markwheeler Merge pull request #4 from markwheeler/dev