#10 Timer
Merge pull request #5 from jaeyz/ss-10

#10 Timer