Update 2.6

Bugfixing