bijan's changes. fast as balls
Merge branch 'master' of https://github.com/drs1/wave