timer destroy issue fixed
Merge pull request #20 from cmarkel5/time_out_action

timer destroy issue fixed
fixed merge conflict