Swap waves, closes #175
Merge pull request #176 from ninjadev/swap-first-waves

Swap waves, closes #175