Merge pull request #22 from mithro/master

Minor documentation updates