Merge branch 'development'
changed maximum decimation to 1024
Merge branch 'change_max_decimation' into development