fix for I5
fix conflict
Merge pull request #5 from immars/I5

fix for I5