Merge pull request #116 from atgeirr/master

More DG time-of-flight improvements.