Small changes
Merge branch 'master' of https://github.com/spfrommer/wave-cc
Added more messages