Updated new features from the raspberry-pi branch.