Updated to match latest SDK and added licensing