Merge remote-tracking branch 'christian/master'
Merge remote-tracking branch 'christian/master'
Added conversion of speed for fpga
Merge remote-tracking branch 'julian/master'