Finalize gi encoding
Merge branch 'master' of https://github.com/saglam/cse507

Merge with local copy of GI.