Fix minor bugs'
Merge branch '0.23'

Conflicts:
	CHANGES
Bump version