Fixed NPN support
Merge pull request #8 from alex/fix-npn

Fixed NPN support