Bugfixes and release 1.1.1