Merge branch 'Leif' into 'master'
improved wave visual
Merge remote-tracking branch 'origin/master' into Leif