Parity check support

OK, sorry for doing that two times, the previous request was a bit broken