inex
again
Merge pull request #11 from arbradley/master

stuff