Fix a typo (fixes #63)
Merge remote-tracking branch 'bbatsov/master' into ja