updated
merge master to devel (hotfix #50)
fixed merge error
fixed merge error
Merge branch 'devel'

Conflicts:
	src/class.wave.php
updated