my first commit
Merge branch 'master' of https://github.com/kpendl/kara-pendl
Committed the merge