lbaumo Merge pull request #584 from martinkilbinger/star_cat