Fixed #04
Fixed #002
Fixed #003