Merge branch 'master' into develop
Tweaked downsample
Tweaked downsample
New version
Merge branch 'develop'