Re-written
 minor edits
Merge pull request #792 from abhinavc/master

Minor edits