fixes to multiple stores per study
Fixing merge issues
Merge pull request #104 from alxdarksage/develop

Fixing merge issues