repair computation
Merge branch 'master' of github.com:jwaldmann/s

Conflicts:
	compressor.hs