First commit
Merge https://github.com/beotiger/justwave

Conflicts:
	LICENSE