John branch
Merge pull request #1 from larvalabs/john

pents90 is in!