Fixed #138 #133 #114
Fixed #138 #133 #114