Merge pull request #1 from joePasz/master

pull