Merge in 0.8 License