anderm Merge pull request #326 from bradweiers/patch-2