Merge pull request #3 from mcevoyandy/dev

Dev