seankross Merge pull request #1 from seankross/dev