Merge pull request #6 from Szune/stable

Merge fix