fixed double timer
changed settings
Merge branch 'd3'