current tests passed
more tests added
breaks added
Merge commit 'fbe9d0d'