Merge pull request #10 from victor-mendoza/emi-3

Fixes for CE gip