Updated dev repo
Merge pull request #1 from danielyewright/dev

Updated dev repo