mlinksva Merge pull request #80 from johnwcowan/patch-1