Merge pull request #15 from joePasz/master

Merge pull request #7 from ebeiersdorfer/master