Merge branch 'liboping-0.3'