Merge branch 'debug-flag' into liboping-0.2