Merge pull request #2 from interopbyt/develop

Develop branch merge
Merge pull request #3 from interopbyt/master

Merge pull request #2 from interopbyt/develop