Final Commit

Tomado del Branch Nexer