closed #160
Beta release 2