lib fixes
Merge branch 'test' of github.com:thomas4g/2340 into test