More stuff added
Merge pull request #18 from Aperx/yolo

More stuff added
Merge pull request #2 from ClashOfBlocks/master

Merge