Start redesign based on advice on SO.
Merge branch 'master' of https://github.com/rmoritz/op2p