Fix #19; integrate changes from Threase
Merge branch 'master' into issue-16

Conflicts:
	.ghci
	test-suite/DocTest.hs