Close Issue

Close #22