Merge pull request #564 from jdorigao/rpi1