More exp10 stuff
Merge pull request #1319 from diizy/stable-1.1

More exp10 stuff