Merge pull request #1 from mathgroveoutlook/master

Edits from forked branch
edit 3 on doc_branch
Merge pull request #1 from sethusrinivasan/master

pull request to child branch