Signed-off-by: Daniel Zigerlig <dzigerli@hsr.ch>
Merge branch 'master' of https://github.com/dzigerlig/CDAR.git
Merge branch 'master' of https://github.com/dzigerlig/CDAR.git