everything done but javadoc and deleting useless comments
Merge pull request #17 from mathieumoli/marti

everything done but javadoc and deleting useless comments