Added ability to have multiple data-dimensions

Fixes issue #11