Version/merged 0.8.7