merge from master
added CLIntWrapper