Merge pull request #16 from shadowglen/master

Trivial changes.