#42 Added changes for CRC support