Coming back to previous version, pull from MDiana fork, incorrect
results
cleaning eclipse adapter