Pull Changes from raspberrypi userland
Merge pull request #4 from silvanmelchior/master

Pull Changes from raspberrypi userland