Fixed #177
Fixed #178
Fixed #182