Merge pull request #1 from competence-plus/master

Update from base
Merge pull request #9 from notes-cplus/master

Merge pull request #1 from competence-plus/master