issue 829, and tests
issue 2263, and tests
update dates in demos
changelog
version 2.1.1