Fix #492 - Add Structure/Cluster element
Merge pull request #495 from ebollens/feature/cluster

Fix #492 - Add Structure/Cluster element