Fixed issues #36 (enhancement) and #37 (bug)
Merge branch 'devel-0.5' into devel-0.6

Conflicts:
	CHANGES
	configure.ac
	examples/Makefile.am