Fixes typo, pull request #50
Merge remote-tracking branch 'upstream/master'