put cmp back in
Merge branch 'master' of github.com:drs1/wave