Merge with Mihap and Leha

Changes in CInputStream and CLoopController