Version final 1.0

+Unit Testing