Merge pull request #2 from ginxwar/master

added from master