Merge branch '49-processing-file-bug' into 'master'

Update where and when time domain selection is done as to not impact qa function

Closes #49

See merge request !26