fix #575
Merge branch '0.3.4-fix-575'