Merge pull request #2 from competence-plus/master

Update