Merge pull request #5 from thejamesdempsey/dev

Dev