Fixing.
Merge branch 'eliza' into testing