Fixes #36
Merge pull request #37 from nicoschtein/patch-3

Fixes #36