Fix #2, patch up tests
Merge branch 'master' of https://github.com/fsprojects/TPCombinators