Merge pull request #2 from mrocklin/mwiebe-2014

Mwiebe 2014
draft of experiment