Merge pull request #3 from Maldor/master

merge