fixings tuff
fixings tuff
fixings tuff
Merge pull request #850 from HakuG/stable

Fixed #750 and #776