resolution of issues #35 and #55
Merge branch 'master' of https://github.com/mff-uk/intlib