Merge pull request #2 from awm/master

Documentation tweaks