Merge pull request #64 from duydao/v5.0

new bugfix build
Merge remote-tracking branch 'upstream/v5.0' into v5.0