Merge pull request #2 from kz5ee/master

DEV Rebase
Merge pull request #3 from kz5ee/DEV

Merge pull request #2 from kz5ee/master