Merge pull request #1 from nickraptis/master

This is good for now
yolo