Bugfixes and new features 1.6