Fix for #1
Merge pull request #1 from example42/master

Upstream pull