Please review an merge this

message explaining what i did