krka Merge pull request #12 from matejcik/upstream