Pick change from master
Merge pull request #14 from timfel/patch-2

Pick change from master