Close PR 106 and other changes