Merge pull request #4 from thejamesdempsey/dev

Dev
Merging