Merge pull request #2 from Szune/stable

Fixed mistakes
Merge pull request #3 from Szune/beta

Merge pull request #2 from Szune/stable