Fixed #12
Fixed #10
Fixed #9
Fixed #7
Fixed #6
Fixed #5
Fixed #2