Merge issues, #73,#74, #76 , #84, #85

Merge Completo DEV-TEAM-D