#102
Merge branch 'master' into lz4