Merge branch 'issue81' into issue78