Fixed incorrect size of data structure being used in memcpy
Merge branch 'master' into Clock_conversion