Generator Public

Solution #498