Fix #13
Add type support for icxx
Fix #14