Merge pull request #2 from sis-cmdb/develop

Merge pull request #1 from sis-cmdb/master
Merge branch 'develop'