first cut updates for CIB
Merge remote-tracking branch 'origin/0.5' into 0.5
Merge pull request #6 from indykish/0.5

0.5 - CIB updates