williamboxhall Merge pull request #59 from michaelpetri/patch-1