Close #58
changes
ok changes