Fixed #1 #2 #3 #4 #5
Fixed #1 #2 #3 #4 #5