Merge pull request #1 from competence-plus/master

Update
Merge pull request #5 from configuration-cplus/master

Merge pull request #1 from competence-plus/master