Merge branch 'pull/liboping-0.3' into liboping-0.3