I think there's a setting you can actually turn on now to do that automatically. It was part of the recent update I think.