parallelize wave partially
Merge origin/master

Conflicts:
	wave.exe