Version 0.8.0 Merge