Merge pull request #2 from typesupply/master

Remerging changes
Trying this again
Merge pull request #7 from benkiel/master

Bit about primes in exceptions