Merge branch 'shai'
* instl 0.9.4