sup
Merge pull request #858 from HakuG/stable

Fixed #749