Merge pull request #64 from penzance/feature/mutli_exp_part2

Feature/mutli exp part2
Merge branch 'feature/mutli_exp_part1.5' into develop