Merge pull request #2 from Szune/stable

Fixed mistakes