Misprint fixed
Encapsulation improved
Tests updated