Merge branch 'master'
Merge pull request #13 from kpi-knu/innka

Merge branch 'master'