Add support for ISB. More for issue #22