Merge pull request #4 from Szune/stable

Quick merge
Merge pull request #5 from Szune/beta

Merge pull request #4 from Szune/stable