Merge pull request #1 from GralBaby/cristian

aa