Initial commit
fixing stuff
Merge pull request #1 from davetimmins/dev

Dev