More "efficient" version of computeSample.
Merge commit 'b72dc3f3fc0d2a6dc46bf6ccb583da803f2613fc'

Conflicts:
	Model/Sample.hs