technomancy Merge pull request #174 from cjlarose/patch-1