Merge branch 'dev1'
timer fix
Points 0.0.1