Merge pull request #32 from wagnert/master

Issue #185: Add timer service functionality