Merge pull request #14 from shadowglen/master

Trivial updates.