Fixes #27
Merge branch 'npe_fix'