Merge pull request #1 from whilgeek/dev

Dev