fat Merge pull request #166 from josephfinlayson/patch-1