More timer changes
Merge branch 'master' of github.com:alvieboy/ZPUino
Merge branch 'master' of github.com:alvieboy/ZPUino