Merge pull request #3 from rxsegrxup/master

Update dev
Merge pull request #4 from rxsegrxup/dev

Merge pull request #3 from rxsegrxup/master