Merge pull request #1 from CraigChilds94/dev

Dev
as
Hopefully up to date
fix?