Add Wisp, fix 'S' ordering
Merge pull request #51 from kinglouisxiv/patch-4

Add Wisp, fix 'S' ordering