Merge pull request #66 from penzance/feature/multi_exp_part3

feature/multi_exp_part3
Merge branch 'feature/multi_exp_part2.5' into develop