Merge pull request #36 from tibistibi/master

fixed the timer config
Merge remote-tracking branch 'origin/vyara-bhit-master'