use namespace for cout #51
Merge branch 'diverge' into releases/1.0