Fixed #807
Fixed #808
Fixed #809
Fixed #813
Merged