Include missing commit lines

These were supposed to go as part of the last commit.
Merge pull request #36 from elliot42/master

Include missing commit lines