Merge pull request #55 from rgschneider/Molly-feature

Molly feature
Merge pull request #56 from rgschneider/Molly-feature

done
index