fixes #56
fixes #55
refs #54
fixes #36
Merge branch 'master' of https://github.com/clover3/isb