safety
safety
safety
Timer fixed
Merge pull request #18 from Aniles/master

timer fixed