set timer interval to 0.1
minor refactoring
Merge remote-tracking branch 'origin/master'