Fixed #255

Conflicts:

	CHANGELOG