Merge pull request #9 from jonatkins/master

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

Pull from upstream.
Fix typos in actual code.  A CSS class name, and a variable name.
Merge pull request #680 from nexushoratio/to-push

More typos; actual code this time.