Fixed #713
Merge pull request #715 from Itaros/fix

Fixed #713