Fixed: #72, #76
Javadocs corrected, code cleaning