Merge pull request #65 from penzance/feature/multi_exp_part2.5

Feature/multi_exp_part2.5
Merge branch 'feature/mutli_exp_part2' into develop