Fix lib order problem on some machines
Merge branch 'release/0.0.5'