Change location of eval in demo
Merge branch 'last-working-for-gub'