Merge pull request #1 from mvbryan/master

7NOV14 - DIAZ
Merge pull request #3 from sdiaz5/master

testing