Address #20
Merge branch 'master' of github.com:jamesghurley/videocore