Fixing timer
Merge branch 'develop'