Merge branch 'johanna_feature'

'johanna_feature'
index
Merge branch 'master' into Molly-feature
merge fixed
Merge pull request #60 from rgschneider/Molly-feature

index