updates
Merge branch 'master' of github.com:kjzhang/wavecube