Merge "Added Waves example." into devel/master