Merge pull request #4 from Szune/stable

Quick merge