Working version, a first glance the actual code seems to be finished,
now we only need to work on tester and documentation