Merge pull request #11 from jonatkins/master

Pull from upstream.
Merge pull request #13 from jonatkins/master

Pull from upstream.
Merge remote-tracking branch 'upstream/master'
Minor typo.
Merge pull request #696 from nexushoratio/proofreading

Minor spelling correction.