fix #237
fix #244
Merge branch 'master' of github.com:AlexNisnevich/untrusted