Raziel Valle Miranda; Adding Changes for 1.6 Release Candidate