Work towards #6.
More work towards #6.
Merge pull request #17 from kumpelblase2/tim_work

Finish / Closes #6. Work for #7.
Merges for PR #18