bug fix
Merge branch 'master' of https://github.com/mff-uk/intlib
debugging view update
merge confilct resolution