Correction of the bug related to the destroy event

Janus Issue #31
Merge branch 'master' into HEAD
Fixing some javadoc.