1.9.4 Update

Fixed #160
Fixed #149
Fixed #178
Fixed #155
Fixed