Close #224
Close #195