Removed annotations, added tests
PWF mappings. Closes #73
Merge pull request #74 from dantleech/pwf_fix

Pwf fix closes #73