merge
Fixed #79