closed #231
closed #228