Make calendar description optional, fixes #176

See issue #176 for details.
(Sorry for the whitespace changes in the diff, it's only removing superfluous tabs from empty lines.)