Merge pull request #4 from jdmielke/master

Jon I1
Bug fixes for iteration 1 code
Merge pull request #11 from aguibert/master

I2