Manually merging pull request #5 into devel branch, with modifications
of my own.
Merge branch 'devel'

Conflicts:
	functions.inc