Fixed #24
Fixed
#32
#24