Updated wp and np
Merge pull request #2 from Spacedude/testing

Merged to improve wp and np module, both in functionality and formatting.