estar 2.0-0

Major fixes

Minor fixes

estar 1.0-1