Changed checksum method
Merge branch 'working'