Fixed #347
Merge