First Go at #197

Pull Request for #197 - Mike Rogers (MI)