Merge branch 'dev'
Cleaned up a bit
Merge branch 'master' into dev
CR filter delay decreased to 200