Fixed #188
Nofix #185
Fixed #186
Fixed #30