Merge pull request #1 from MaDaFa/master

merge