Fixes #22
Merge remote-tracking branch 'upstream/master'
Merge pull request #23 from vincent-zurczak/master

Fixes #22