Merge pull request #205 from kberg/docs