Merge pull request #1 from jonatkins/master

Pull from upstream.
Merge pull request #2 from nexushoratio/master

Pull from upstream.
Change likely typo in variable names to be consistent.
Merge pull request #660 from nexushoratio/to-push

Change likely typo in variable names to be consistent.