Fixed some compile errors v2
Merge branch 'master' of github.com:Vivekxk/ir