Some more stuff, should be tested on the pi
Merge pull request #1 from blefaudeux/ben

Some more stuff, should be tested on the pi