Merge pull request #5 from olberger/master

A few minor fixes