fix more IRI issues
Merge pull request #28 from sesuncedu/master

fix more IRI issues