Merge pull request #236 from svost/libcommon-w2