Added wavelet compression
Merged