Merge pull request #6 from SymbIoT-Systems/develop

Develop
Merge pull request #7 from SymbIoT-Systems/master

Merge pull request #6 from SymbIoT-Systems/develop