Changes
Merge https://github.com/Lowrenz/wave