Open the data source at the correct time
Merge branch 'master' of https://github.com/peterringset/ProgArk.git