Fix memory leak on Java 1.7
Merge pull request #60 from aegif/topic_linzhixing

Fix memory leak on Java 1.7
Merge pull request #61 from aegif/integration

Integration