Improved TWiki patterns

See also #529
Merge pull request #530 from q--/patch-1

Improved TWiki patterns