Merge pull request #1 from ewinslow/master

Final PR