Failing test and new requirements considered.
Merge branch 'master' of github.com:spectrumbranch/crunch