Merge pull request #1 from Crandel/1firstbranch

ddd
Merge pull request #3 from Crandel/master

Merge pull request #1 from Crandel/1firstbranch