Fixed #31
Fixed #32
Merged