afeld Merge pull request #132 from svenevs/patch-1