alice in wonderland
fixes #75
fixes #42
Merge branch 'master' into gh-pages