Version update 2.0.6

Mostly bug fixes - See CHANGELOG for details