Raspberry Pi patch
Merge pull request #700 from srdjantot/master

Raspberry Pi patch