Typo
Merge pull request #21 from Laxa/upstream

Typo
Merge branch 'upstream'
Merge remote-tracking branch 'upstream/master'