Changes in develop
Merge pull request #5 from RapidScada/develop

Changes in develop