Merge pull request #2 from paxtontech/master

dev
Merge pull request #3 from paxtontech/dev

Merge pull request #2 from paxtontech/master