Merge pull request #1 from competence-plus/master

Update