Merge pull request navasmdc#92 from navasmdc/develop

Fix some bug and performance improvement

Merge pull request navasmdc#90 from navasmdc/develop

Add the gradle dependency information