Add ability to select md5
Merge branch 'fix-select-md5'