Handle (P)NaCl crosses
Merge pull request #26 from DiamondLovesYou/master

Handle (P)NaCl crosses.