improvements, but still not there
Merge branch 'master' of http://github.com/gunny26/raspberry
improvements