fixes #4, fixes #6
Merge branch 'master' of https://github.com/heythere-project/yolo