Implementation finished & corrected
tests implemented
minor change