3 branch
Merge pull request #1 from sampythoner/three

3 branch
Merge pull request #2 from sampythoner/master

ddd