Merge pull request #1 from avplayer/master

merge him