Issues Committed: #6, #7, #8, #10, #11 e #13