Wrap comments at 80 chars
Rename interval to timeout for clarity
Merge pull request #1 from Jimdo/cli

More work on CLI