Release

Close #20 
Close #24