merge fix
Merge branch 'develop' of https://github.com/tistatos/TNM061-StereoSnowSim into develop