closed #196
closed #248