Merge pull request #1 from crainbf/nonsense-branch

adding name
merging with upstream/master
merging with upstream/master
res
fixing docs file
typo fixed