fixed some problems
Merge github.com:Winsen1990/jdgl