Code ready
Merge branch 'master' of github.com:agh-glk/pjn
Merge branch 'master' of github.com:agh-glk/pjn