Merging changes from https://github.com/oakman/clamavj, lifting version to 0.4