issues #6 fixed e #7 fixed.