Merge pull request #1 from Crandel/1firstbranch

ddd