Merge pull request #1 from bozcotty/dev

Dev