Issue #46: can now use patterns for cluster name/id

Fix for issue #46.