Reduced complexity in utilities
Merge branch 'master' into issue_8

Conflicts:
	CHANGES.rst
Simplified too complex method
Merge pull request #39 from collective/issue_8

Reduced complexity in utilities