added on the fly compression
Merge remote-tracking branch 'origin/master'