Fix #89. Quote yield to avoid SyntaxError in Android browser
Merge branch 'dev' into dev-200
Remove unnecessary level of indirection