Merge pull request #1 from cristazn/master

asdsadsa