Changed datasource. Closes #46.