Merge http://github.com/duckaz/CastBerryPi