Filling in some more blanks
Merge pull request #40 from gvwilson/master

Filling in some more blanks