Merge pull request #49 from drobbs/master

Fixed things.