Fixed documentation, updated release information
Merge branch '0.4' into 0.5

Conflicts:
	CHANGES