add dimension support, test for time

reworked and cleaned up
Merge pull request #79 from ischneider/pr-70-reworked

add dimension support, test for time