Add option for PN order of waveforms; closes #24