Merge pull request #346 from cpoulain/master

First pass at worksheet/experiment integration (#321)