Updated to new libraries (again...)
Merge branch 'master' of github.com:joh06937/raspberry_pi