Merge pull request #11 from aguibert/master

I2
Merge pull request #12 from aguibert/master

I2 stuff
I2 methods
merge fixes
Merge pull request #6 from jdmielke/master

Jon's I2 stuff