Merge pull request #6 from Szune/stable

Merge fix
Merge pull request #7 from Szune/beta

Merge pull request #6 from Szune/stable