Final preso
Merge pull request #661 from jas2715/master

Final preso