testing commit
Merge branch 'master' of ssh://github.com/Safarikarel/PPNPReview

merging with karel's changes?