2nd try :D
Merge pull request #23 from JBukCZ/master

Fixing TickHandler