Merge pull request #39 from mccoyst/master

Two small fixes