Fixed #28
Fixed #13