Fixed problem with empty data
Merge branch 'develop' of https://github.com/wysekm/DistributedSystemMonitoring into develop