Fix returned pointers from lib, fixes #87
Merge branch 'master' into builds
7.396