fix #183
fix #189
fix #197
Merge branch 'master' of github.com:AlexNisnevich/untrusted