fix #40
fix #39
fix #39
Merge branch 'master' of https://github.com/libis/VDIC.git