Merge pull request #1 from joePasz/master

pull
Merge pull request #4 from ebeiersdorfer/master

Merge pull request #1 from joePasz/master