voxxit Merge pull request #95 from afeld/patch-1