Update to 0.13.8-SNAPSHOT

Update to: 0.13.8-SNAPSHOT, 0.13.7, improve formatting.